-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add a simple version to fill the unique needs of slit4 #672
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's try it out on the beamline tomorrow, the signals are definitely currently wrong.
For signal correctness, try running the system tests on the Diamond network: https://github.com/DiamondLightSource/dodal?tab=readme-ov-file#testing-connectivity |
connectivity check fails for this device AND panda1 |
2923a80
to
c5d7ef2
Compare
will test on 30.07 |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #672 +/- ##
=======================================
Coverage 94.43% 94.44%
=======================================
Files 113 113
Lines 4581 4588 +7
=======================================
+ Hits 4326 4333 +7
Misses 255 255 ☔ View full report in Codecov by Sentry. |
c5d7ef2
to
74be14d
Compare
4ee837e
to
82c11ef
Compare
not sure what is the desired behavior, which PVs do we want to expose? the EDM screen shows: @DiamondJoseph please advise |
Let's ask the beamline scientist tomorrow, but I assume that we want all of them. |
still not right, need to talk to the scientists |
@DiamondJoseph this fits the Hyperion model of 'the changes fit our model of the beamline', and it passes the tests, can we merge this now? |
this was successful, ready to merge |
434a7e7
to
fd1a91c
Compare
src/dodal/devices/slits.py
Outdated
self.horizontal_dso = Motor(prefix + "HDSO") | ||
self.vertical_dso = Motor(prefix + "VDSO") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should: As someone not involved in i22, it's not clear what dso
means here. Could we have a comment or rename the variable to something more human readable
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not either. that is how it was defined in EPICS. I did inquire on 07.08.2024 and received no response since.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, well I don't feel comfortable us having code in dodal
where no-one understands what it means. Could you please chase up? Have you asked Scientists+Controls?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I followed up again
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So they stand for defining_slit_opening
? Can we just use gap
as that's what we use everywhere else
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm also assuming that "defining slit opening" -> "slit width" -> "gap"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think they are all equivalent, we use gap
everywhere else, it's succinct (unlike defining_slit_opening
) and makes more sense for x and y (unlike width
which sort of implies just x
). So I think we should stick to gap at the ophyd level
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok I change it into x_gap
etc, and moving the 'dso' into the class docstring
fd1a91c
to
7ca332f
Compare
At which point we've got some very similar looking classes. It'd be nice if we could a. confirm that SpecialSlits.x is defining x centre, not e.g. x_min, and b. treat them all as some sort of generic slit with x_centre, x_gap, y_centre, y_gap |
yes, it is centre. we can make both classes have the same properties but they do need to have different logic. @DominicOram and @DiamondJoseph, how would you like this to be implemented?
|
Co-authored-by: DiamondJoseph <[email protected]>
5b138a3
to
291050c
Compare
would be my preference. |
My preference would be:
|
closing as this will be solved at the epics layer |
fixes #587